From 380fd3ed0dea5d9e2ac8006398feb0e70b14f5fc Mon Sep 17 00:00:00 2001 From: "awilliam@xenbuild.aw" Date: Thu, 8 Jun 2006 11:08:35 -0600 Subject: [PATCH] [IA64] Put guest physical translation into VHPT Signed-off-by: Anthony Xu --- xen/arch/ia64/vmx/vmx_phy_mode.c | 47 ++++------------------------- xen/arch/ia64/vmx/vmx_process.c | 2 +- xen/include/asm-ia64/vmx_phy_mode.h | 2 +- 3 files changed, 8 insertions(+), 43 deletions(-) diff --git a/xen/arch/ia64/vmx/vmx_phy_mode.c b/xen/arch/ia64/vmx/vmx_phy_mode.c index 95f827e2be..0ce402018a 100644 --- a/xen/arch/ia64/vmx/vmx_phy_mode.c +++ b/xen/arch/ia64/vmx/vmx_phy_mode.c @@ -105,55 +105,20 @@ physical_mode_init(VCPU *vcpu) } extern void vmx_switch_rr7(unsigned long ,shared_info_t*,void *,void *,void *); -/*void -physical_itlb_miss(VCPU *vcpu, u64 vadr) -{ - u64 psr; - IA64_PSR vpsr; - u64 xen_mppn,xen_gppn; - vpsr.val=vmx_vcpu_get_psr(vcpu); - xen_gppn=(vadr<<1)>>(PAGE_SHIFT+1); - xen_mppn = gmfn_to_mfn(vcpu->domain, xen_gppn); - xen_mppn=(xen_mppn<>63) - xen_mppn |= PHY_PAGE_UC; - else - xen_mppn |= PHY_PAGE_WB; - psr=ia64_clear_ic(); - ia64_itc(1,vadr&PAGE_MASK,xen_mppn,PAGE_SHIFT); - ia64_set_psr(psr); - ia64_srlz_i(); - return; -} - -*/ -/* - * vec=1, itlb miss - * vec=2, dtlb miss - */ void -physical_tlb_miss(VCPU *vcpu, u64 vadr, u64 vec) +physical_tlb_miss(VCPU *vcpu, u64 vadr) { - u64 psr; + u64 pte; IA64_PSR vpsr; - u64 xen_mppn,xen_gppn; vpsr.val=vmx_vcpu_get_psr(vcpu); - xen_gppn=(vadr<<1)>>(PAGE_SHIFT+1); - xen_mppn = gmfn_to_mfn(vcpu->domain, xen_gppn); - xen_mppn=(xen_mppn<>63) - xen_mppn |= PHY_PAGE_UC; - else - xen_mppn |= PHY_PAGE_WB; - - psr=ia64_clear_ic(); - ia64_itc(vec,vadr&PAGE_MASK,xen_mppn,PAGE_SHIFT); - ia64_set_psr(psr); - ia64_srlz_i(); + pte = vadr& _PAGE_PPN_MASK; + pte = pte|(vpsr.cpl<<7)|PHY_PAGE_WB; + thash_purge_and_insert(vcpu, pte, (PAGE_SHIFT<<2), vadr); return; } + void vmx_init_all_rr(VCPU *vcpu) { diff --git a/xen/arch/ia64/vmx/vmx_process.c b/xen/arch/ia64/vmx/vmx_process.c index c6e4d0220c..304a78a3f5 100644 --- a/xen/arch/ia64/vmx/vmx_process.c +++ b/xen/arch/ia64/vmx/vmx_process.c @@ -259,7 +259,7 @@ vmx_hpw_miss(u64 vadr , u64 vec, REGS* regs) return IA64_FAULT; } } - physical_tlb_miss(v, vadr, vec); + physical_tlb_miss(v, vadr); return IA64_FAULT; } if(vec == 1) type = ISIDE_TLB; diff --git a/xen/include/asm-ia64/vmx_phy_mode.h b/xen/include/asm-ia64/vmx_phy_mode.h index 8cc35352c0..02f8cc643f 100644 --- a/xen/include/asm-ia64/vmx_phy_mode.h +++ b/xen/include/asm-ia64/vmx_phy_mode.h @@ -96,7 +96,7 @@ extern void prepare_if_physical_mode(VCPU *vcpu); extern void recover_if_physical_mode(VCPU *vcpu); extern void vmx_init_all_rr(VCPU *vcpu); extern void vmx_load_all_rr(VCPU *vcpu); -extern void physical_tlb_miss(VCPU *vcpu, u64 vadr, u64 vec); +extern void physical_tlb_miss(VCPU *vcpu, u64 vadr); /* * No sanity check here, since all psr changes have been * checked in switch_mm_mode(). -- 2.30.2